Skip to content

fix(windows): windows branch switch ui broken#1038

Open
EwanJordaan wants to merge 3 commits intopingdotgg:mainfrom
EwanJordaan:fix(windows)/branch-selection-ui
Open

fix(windows): windows branch switch ui broken#1038
EwanJordaan wants to merge 3 commits intopingdotgg:mainfrom
EwanJordaan:fix(windows)/branch-selection-ui

Conversation

@EwanJordaan
Copy link

@EwanJordaan EwanJordaan commented Mar 13, 2026 •
edited by macroscopeapp bot
Loading

What Changed

  • Moved selected-row styling into the shared combobox and autocomplete primitives
  • Removed branch-selector-specific selected styling
  • Fixed the Windows branch switch UI so the active/selected branch renders consistently

Why

The branch switcher already controls selection through the combobox value state, but the selected styling was partly hardcoded in the branch selector itself. That made the UI behavior inconsistent and more fragile. This change makes selected-state rendering come from the shared primitives, which keeps behavior consistent across combobox-based UIs and fixes the Windows branch selection issue.

UI Changes

Before:

  • The selected branch row could render incorrectly or inconsistently in the branch switch UI on Windows

After:

  • The selected branch row uses the shared selected-state styling
  • Hover, highlighted, and selected states are now consistent with the shared combobox/autocomplete behavior

Video:

Screen.Recording.2026-03-13.195339.mp4

Checklist

  • This PR is small and focused
  • I explained what changed and why
  • I included before/after screenshots for the UI change
  • I included a video for animation/interaction changes

Issue #1040

Note

Fix branch selector UI styling on Windows

  • Adds a branchSelectorHighlightClassName constant to BranchToolbarBranchSelector.tsx with dark (#242424) background and white text for hover, selected, and highlighted states, replacing a broken conditional bg-accent class.
  • Updates combobox.tsx and autocomplete.tsx to add hover:bg-accent, data-selected:bg-accent/50, and data-selected:text-foreground to item base styles.
  • Behavioral Change: The active branch item no longer receives a custom accent style outside of the component's selected/highlighted state; all visual feedback now comes from data attributes.

Macroscope summarized d3f6d4f.

@github-actions github-actions bot added size:XS 0-9 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list. labels Mar 13, 2026
Unify branch selector item highlight styling
7fb763f 
- Apply shared hover/selected/highlight class to all branch combobox items
- Keep branch action rows and branch rows visually consistent in the selector
@coderabbitai
Copy link

coderabbitai bot commented Mar 13, 2026 •
edited
Loading

Important

Review skipped

Auto reviews are disabled on this repository. Please check the settings in the CodeRabbit UI or the .coderabbit.yaml file in this repository. To trigger a single review, invoke the @coderabbitai review command.

⚙️ Run configuration

Configuration used: Repository UI

Review profile: CHILL

Plan: Pro

Run ID: ab882fc8-12d4-46f6-9b8a-6647da313122

You can disable this status message by setting the reviews.review_status to false in the CodeRabbit configuration file.

Use the checkbox below for a quick retry:

  • 🔍 Trigger review
✨ Finishing Touches
🧪 Generate unit tests (beta)
  • Create PR with unit tests
  • Post copyable unit tests in a comment
📝 Coding Plan
  • Generate coding plan for human review comments

Thanks for using CodeRabbit! It's free for OSS, and your support helps us grow. If you like it, consider giving us a shout-out.

❤️ Share

Comment @coderabbitai help to get the list of available commands and usage tips.

Tip

You can make CodeRabbit's review stricter and more nitpicky using the `assertive` profile, if that's what you prefer.

Change the reviews.profile setting to assertive to make CodeRabbit's nitpick more issues in your PRs.

@github-actions github-actions bot added size:S 10-29 changed lines (additions + deletions). and removed size:XS 0-9 changed lines (additions + deletions). labels Mar 13, 2026
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

No reviews

Assignees

No one assigned

Labels

size:S 10-29 changed lines (additions + deletions). vouch:unvouched PR author is not yet trusted in the VOUCHED list.

Projects

None yet

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

1 participant

@EwanJordaan